Auto merge of #1199 - retep998:winapi, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 20 Jan 2015 17:24:32 +0000 (17:24 +0000)
committerbors <bors@rust-lang.org>
Tue, 20 Jan 2015 17:24:32 +0000 (17:24 +0000)

Trivial merge